super clean
Merge pull request #16 from quinnydinny/dev

super clean