V1.0: Tidy up commit
Merge