Merge pull request #343 from adamretter/develop

Fix code formatting