Various changes
Merge pull request #15 from sroecker/master

Various changes