fixing #125

fixing #125
Merge pull request #129 from zeroed/master

fixing #125