Fixed issue #107
Merge branch 'fixed#107' into my_branches