issues #20 fixed
Merge branch 'issue_20'