Fixes #25
docs for #30