Sasa/bugfix/ex doc conflict

resolves #6