Fix for #59
Merge pull request #60 from gtmtechltd/master

Fix for #59