resolved #13
fixed #14
updated docs, resolved #10