Minor fixes
Merge pull request #9 from kristallizer/api

Minor fixes