Fixed issue #153
Merge pull request #175 from PonteIneptique/issue-153-wip

Fixed issue #153