API changes
Merge pull request #14 from nejcjelovcan/master

API changes