clean
refactor
refactor
refactor
refactor
Merge pull request #1 from qii/0.49

sync