This then?
Merge pull request #7 from boiert/master

This then?