Merge pull request #1 from Remscar/devdaniel

Code Cleanup
Merge branch 'remscar' into Dev