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

[FIX] coding style issues