Refactoring.
Merge branch 'master' of https://github.com/dranger003/rht03