Merging issue37 branch into 1.2 release

Merging issue37 into 1.2 release