Fix for #94
Merge pull request #95 from socram8888/master

Fix for #94