Merge pull request #19 from jschneider/develop

added code style setting