Improved docs, resolved #5, added UT for #5, corrected spelling