Cleanup

Removed warnings from many things.
Merge pull request #10 from apepers/master

Cleanup