Updated to Flaminsarge's latest files

I think.
Merge pull request #6 from TheKins/master

Update fork with upstream commits