Merge pull request #5 from eroot/master

Style improvements
Fixed indentation