Added the changes by @JadenWong again to resolve merge conflicts; closes #35
Merge pull request #37 from Vexatos/patch-1

Added the changes by @JadenWong again to resolve merge conflicts; closes #35