commits
Merge remote-tracking branch 'origin'
tidied code