Added omega configuration parameter
Merge branch 'master' into new_simple_html_page