Various fixes
Merge pull request #61 from marcuslinke/master

Various fixes