added awesome new feature
Merge branch 'Awesome_new_feature'
Merge branch 'master' into Awesome_new_feature
Added new feature
Merge pull request #1 from mdeluca/Awesome_new_feature

Awesome new feature