Complying to coding standards

Signed-off-by: Joshua Paling <joshua.paling@gmail.com>
Merge pull request #5 from joshuapaling/master

Complying to coding standards