3rd commit before merge
Merge pull request #4 from treble37/merge-into-staging2

3rd commit before merge