Changes to aid ease of initial setup
Merge pull request #1 from djhype/master

Changes to aid ease of initial setup