Fix #136
Merge pull request #145 from zeroed/master

Fix #136