Several new features and updated docs. Fixes #6