Code-review
Merge pull request #4 from FireSBurnsmuP/cr2-karmeow

Code-review