Updated API
Merge pull request #10 from RobertPieta/master

small api updates