issue_#51 fixed
Merge branch 'master' into iss51