fixes for last changes
Merge branch 'development'
version bump