REfactored API
Merge pull request #36 from dragos-dumi/master

REfactored API