some changes - I hate merge conflicts...
Merge https://github.com/vianuevm/Spitlist