Added commentary support; various fixes
Merge branch 'master' of http://github.com/rism-ch/muscat