Fix #227
Merge pull request #229 from nuclearace/patch-1

Fix #227