Refactor (as suggested in #6)
Refactor arguments parsing
Bump version number