Merge pull request #1 from gslin/master

Refactor