KISS
Merge pull request #21 from tristanbes/tristanbes-master

KISS