tested on macbookpro9,2
Merge pull request #20 from the0ther/master

tested on macbookpro9,2