Merge pull request #4 from mach-mme-dev/pawos_branch

*WRC - Improvements
Merge pull request #5 from mach-mme-dev/master

*WRC - Improvements and 1 Bug fix