Merge pull request #26 from ivange94/develop

Refactored code to remove boilerplate