issue 58 work
hotfix
issue 58
Merge branch 'iss58'