resolves #166
resolves #166
Merge pull request #167 from davidverholen/master

resolves #166