Fixing issue 159
Merge pull request #192 from markwylde/master

Fixing issue 159