Merge branch 'master' into staging
Merge pull request #8 from kdpark/staging

Merge branch 'master' into staging