minor ff
Merge branch 'jqml' of https://github.com/thinkcontext/Think-Context into jqml