move subsitute_values function into utils module
modularize code further
bump version to reflect changes
Merge pull request #1 from eugene-eeo/refactor

Refactor codebase