branch test
fixed bugs in hotfix
Merge branch 'testing'
fixed a bug
merged master with testing