Sanitise manual macchange
Formatting
Merge pull request #1 from SilverFoxx/dev

Merge dev