Merge pull request #51 from cfoellmann/master

html and text changes for option. Close #29