fix issue #134
Merge pull request #135 from zxcvdavid/dev

Fix issue #134