Make it easier to integrate into other projects
Merge pull request #1 from elfrank/refactor

Make it easier to integrate into other projects