[FIX] coding style
Merge pull request #50 from hbrunn/7.0-travis-2014-10-20

[FIX] coding style