Added some functions and changed some names (v0.1.4.a22)