Fixed GH#78.
Merge branch 'gh_78_2' into develop