Fix version number typo
Merge branch 'master' into dev
Renamed functions to avoid name conflicts and implemented workaround for API name issue