update
Merge branch 'lassi'
add setting httpd in readme