Add new feature #1234
Add new something cool for #1234
Merge pull request #3 from tangeb/feature-1234

Add new feature #1234