Fixes for closing the MotD
Merge pull request #175 from Person8880/develop

Fixes for closing the MotD