Merge branch 'development'

merging changes so far...