Add documentation
Remove default arguments from emaillib
Merge branch 'dev'
Merge branch 'master'