Fix for bug #66
Merge pull request #67 from jmotes/master

Fix for bug #66