Merge pull request #6 from dan-c-underwood/master

Merge branches
Remove /**/ block comments
Merge pull request #7 from dan-c-underwood/Dev

Merge comment change