Refactoring
Updating to new android support on travis