Merge pull request #266 from bastih/master

A small batch of improvements