WIP: refactoring code
Merge branch 'master' of https://github.com/ethanlee2014/wwbr_app