Issue116 pedantic

This merges https://github.com/iea-annex60/modelica-annex60/pull/117 for review and testing prior to merging it to the master.