format update
Merge pull request #35 from ScottehMax/new-format

format update
Fix unreleased bugs