Cleaned up
Merge pull request #7 from JohnnyPP/dev-linux

Cleaned up