Resolves #189
Merge pull request #191 from jbvanzuylen/issue_189

Resolves #189