Fixes and stuff...
Merge pull request #97 from mannol1/master

Fixes and stuff...