Modifications for Issue 256

This is a revised solution for Issue 256. Please first accept Wei's pull request 
https://github.com/lbl-srg/modelica-buildings/pull/268

Then update the files with my pull request.