Feature/doc

This branch implements
 - #300
 - #301