Changed to new API
Merge pull request #1 from medokin/dev

Changed to new API