Fixes #25
merged dev
generated documentation