Merge branch 'master' into development
Updated version for gem with auto-directory create fix
Merge branch 'development'