bug fix
Merge branch 'development'

pulled bugfixes from development