Merge pull request #82 from pioardi/editorconfig