Feature/doc

This branch implements
 - #238 
 - #300
 - #301 
 - #331