Refactor entry point
Merge pull request #16 from stefanv/entry_points

Entry points