Remove v1 logic
Merge pull request #19 from fotioslindiakos/master

Removed conditional v1 logic