Merge pull request #37 from christopheschwyzer/issue-37