Fixed #54
merged dev
generated documentation