Implemented issue #1.
Documentation is still to be reviewed according to these changes.