Merged and updated version (v0.1.5.a1)