Merge pull request #104 from langner/master

Some minor improvements