Issue 199

This is for issue 199. I could not find a way to attach the pull request to the original issue :-(