Merge pull request #219 from adrian17/master

Improvements for a9091b41b6