Merge pull request #2 from markklick206/master

Gimme stuffs
CHANGES
Merge pull request #6 from fireland15/master

CHANGES