Fixes #29

And updates documentation