Merge pull request #156 from motom001/msmolny_patch_for_issue_154