Fix #105
Merge pull request #137 from almirsarajcic/master

Fix #105