Merge pull request #6 from Argon-/master

Slight adjustments, Readme update
Merge pull request #7 from Argon-/master

Some OSX fixes
Fix compilation on Linux.