Merge pull request #18 from AkimanBengus/master