Updated some files to API 1.1
Merge pull request #22 from whitekiba/master

Updated some files to API 1.1