Added AppCompat dependency
Fixed error on converting back to simple text
Merge remote-tracking branch 'origin/master'