Fixes according to programmer request
Merge branch 'hotfix-1'