bug fix
hotfix
finished bug fix
Merge branch 'issue22'