Fixed bug #137: options are broken in Safari 7
Merge branch 'development' of github.com:adam-p/markdown-here into development