Upgrade support lib
Merge pull request #1 from kotlinski/fix/androidsupport

Upgrade support lib