new feature 2
Merge pull request #1 from jpeskin/feature2

new feature 2