Merge pull request #69 from pioardi/feature/prettier