bug corrections
Merge branch '1.0.1'