Had lots of problems with android support library and had this to commit after fixing it