fixed issues #1 and #2, updated docs and tests