version 1.2

Bug fixings and other changes