Merge pull request #27 from AkimanBengus/master