Merge pull request #1 from DavidtheCreator/master

Error fix #1 is (most likely) confirmed.
- David