API refactor
Merge pull request #2 from attila-kiss-everit/master

API refactor