updated last changes before moving to 0.1.4