New awesome feature
Merge pull request #12 from JonasHazell/feature1

New awesome feature