Fixed a few compiler warnings and compilation on OS X
Merge pull request #85 from JanSimek/master

Fixed a few compiler warnings and compilation on OS X