Make some function commands generate <mo>. Fix issue #12
Merge branch 'master' into gh-pages
update from master