Merge pull request #5 from tux3/master

``Rebase'' on upstream
Merge pull request #6 from tux3/master

Rebase on upstream
Fix buttons on OS X
Merge pull request #112 from F1ynn/OSX-fixes

Osx fixes