Fix for issue #36
Merge pull request #37 from sinfomicien/fix-for-issue-36

Fix for issue #36