Issue37

Merging issue37 into 1.2 release