Issue 143
Merge pull request #169 from fluffy/issue143

Issue 143