merge WG changes from 0.8.10 to 0.8.11
Merge pull request #18 from mEDI-S/changes

merge WG changes from 0.8.10 to 0.8.11