Merge pull request #9 from FlaminSarge/master

Fix all the lowercase stuff, merge issues, etc.
Merge pull request #13 from TheKins/master

Update fork with upstream commits