I just need it for my presentation tomorrow
Unit-tested and fixed