first commit staging 4
Merge pull request #6 from nick-zhu-sirca/staging-4

 first commit staging 4