Big reformat
Merge pull request #14 from GeminiCode/dev

Big reformat