New day, new code!
Merge pull request #1 from c-ferdinands/master

New day, new code!