refs #14
Merge pull request #17 from ho-nl/master

refs #14