fixed bugs in the first proposal
Merge remote-tracking branch 'origin/production'