Merge pull request #33 from williecheong/staging

Staging
Merge pull request #34 from williecheong/staging

Staging
Merge branch 'staging'
Merge pull request #35 from williecheong/staging

Staging
Merge branch 'master' into staging