bug fixes
Merge branch '2.x' into 1.x
bumpd version to 1.0.1