second commit
Merge pull request #1 from rbubke/feature1

second commit