Merge pull request #4 from Shane-IL/master

Merge changes
Fixed Merge Mess-up
Merge pull request #5 from Shane-IL/Work

Work