Merging my work with work from Cannibal Open Touch Recovery.
Merging branch development && creating branch 0.0.1.