Version 1.2

Fixing bugs, 3 and 4