Fourth commit (v 1.2)

Bug fixes