Fixed bugifx bug #102
Merge branch 'bugfix/102' into develop