Fixes #74, closes #74

Hope this helps!