Initial development
Intrduced Scrutinizer fixes.
Merge pull request #1 from bradcornford/develop

Merged from Develop