feat: merged version of PR #32, #34, and #35

[azaslavsky]

PR's #32, #34, and #35 produce a lot of merge conflicts when pulled into master (mainly in the documentation). This commit has resolved all of those conflicts, and can be accepted in lieu of the others if all three are deemed acceptable.