added test file
fixed hotfix
Merge branch 'develop'