Merge pull request #37 from christianselig/7.x

travis-ci addition and coding standards fixes