Fixed typos in Main and CashInsertion
Fixed merge issue
Merge remote-tracking branch 'origin/master' into matt