3rd commit before rebase
Merge pull request #3 from treble37/rebase-into-staging1

3rd commit before rebase