Merge pull request #5 from JonnyH/linux

Linux
Formatting