Updated version number
Merge branch 'development'