Decided to update the docs, as well as adding few new features and small refactoring.
This is a follow-up to previous commit.