Added some functions and changed some names (v0.1.4.a22)
Merge branch 'v0.1.4.a22' into v0.1.4.a1