Refactor
Merge pull request #5 from pmorie/build

Refactor