Removing 3rd party APIs, better solution coming soon
Merge remote-tracking branch 'origin/master'