simeji Merge pull request #65 from 0mp/patch-1 …