bumped version
Merge branch 'production'