bug fixes dec 16
Merge branch 'development'