Close #43 - This commit should fix the issue.