Bad idea to do this at 1:00
(bis)
Merge pull request #6 from tristanbes/master

Bad idea to merge PR at 1:00 am