Resolves #194
Merge pull request #195 from jbvanzuylen/issue_194

Resolves #194