Fix #119
Merge pull request #122 from Antek88/issue_119

Fix #119