conflict: s4 vs. roxygen2 'fixed'? update docu
Merge branch 'master' of github.com:wahani/saeSim