Merge pull request #4 from Shadow6363/master

Merge seems to have gone awry. Fixed what I've noticed.