bug fixed
refactorying
Merge branch 'master' of https://github.com/jerryshew/SweetHome