exception added
Merge branch 'master' of github.com:evanyeung/HelloSite