Bug Fixes

Migrated to  android support library 13