Merge branch 'options_page'

fix #10