issue 51 fixed
Merge branch 'issue-51'