Fixes Issue #15 thanks @caspark!