A bunch of fixes
Merge pull request #9 from ganymedes02/master

A bunch of fixes