Fixing issue #58
Merge branch 'master' of https://github.com/googlecast/CastCompanionLibrary-android