Should fix Github issue 57
Merge pull request #76 from justin-calleja/issue-57

Should fix Github issue 57