Merge Wg15 dev branch into master to close #32 and #33 issues#36

gigi61 wants to merge 15 commits intomastercimug-org/jCleanCim:masterfrom

wg15-devcimug-org/jCleanCim:wg15-devCopy head branch name to clipboard