Merge pull request #1 from DrDavid/master

Getting changed from David
Merge pull request #4 from JWocky/master

Merge pull request #1 from DrDavid/master