Merge development with production from 0 to 1.0.1