#52 Enhanced documentation after last presentation
#50 die if mail not allowed
#50 die if mail not allowed
Merge branch 'master' into master-v0.4

* master:
  #50 die if mail not allowed