v0.1.22 - fixes issues #22 and #23