Fix formatting
Merge pull request #52 from danmcp/master

Fix formatting
Fix detached travis error
Merge pull request #53 from danmcp/master

Fix detached travis error