Merge pull request #2 from martingeorg/master

Few minor changes