Tweaks from another test
Merge pull request #56 from chylex/master

Tweaks from another test