peed in the pool
peed again
manually cleaned up conflict
Merge pull request #4 from jmaxsfu/master

Simpler