Changed formatting and Headers
Merge branch 'my'