worked on several bugs
Merge branch 'development' into qa