issue 56
hotfix
finish issue 56
Merge branch 'iss56'