work in progress
Merge pull request #1 from peterkokot/master

work in progress