Fix for #54
Merge pull request #56 from jjmalina/master

Fix for #54