Merge pull request #282 from pdendek/master

AND and DocSim for Comac, minor changes elsewhere