fix #22
fix #21
fix #24
Merge pull request #25 from ecomfe/1.2.2

Closes #21
Closes #22
Closes #24