Merge pull request #44 from janm399/master

Even more strict scalastyle settings