#106 fixed
Merge branch 'issue_106'