Small bug fix
Merge branch 'development' Small bugfix pull