Fixed issue125
Merge pull request #127 from pbrier/issue125

Fixed issue125