Merge pull request #17 from AkimanBengus/master