quite important changes in last couple of commits, increasing version to 0.1.2