Fixing issue #127
Merge branch 'issue127' into develop