#92 fixed
#92 Tiny improvement
Merge branch 'issue_92'