Update site with Joowon's recommendation.
Merge branch 'development' into staging