New functions and tests v.0.2.0