Merge pull request #204 from zcorpan/fix-195-196-197-199

Authoring conformance: fix #195 #196 #197 #199