Merge pull request #2 from NickFaneSoftware/master

Merge NickFane branch into Master branch
Nick Fane's Changes
Merge pull request #3 from NickFaneSoftware/NickFaneDevBranch

Nick fane dev branch