GNU style
Merge pull request #2 from Eageon/master

GNU style