Merge pull request #1 from kalxas/master

Various fixes for 2.0 API