20140410_hugh
Merge branch 'master' of https://github.com/amityshih/workspace