Merge pull request #30 from karuturi/4.10-api-changes-issues-fixed

4.10 api changes and fixed issues