Proposed fix for #51 and #57
Merge pull request #60 from sublimator/develop

Proposed fix for #51 and #57