Merge branch 'development'
Preparing 1.0.5 release