astyle cleanup
Merge pull request #15 from eheien/master

astyle cleanup