parameter optimization and log removal
Merge branch 'master' into gh-pages