Fix #86
Merge pull request #89 from chemikpil/master

Fix #86