astyle formatting
Merge pull request #1 from HaraldZealot/master

astyle formatting