Ionic support.
Minor improvements.
Merge branch 'ionic'