Bug Fixing and code improvement
Merge branch 'master' of https://github.com/DrJest/nerdz-template-metro