#25 do not do it like an idiot
Merge pull request #104 from kalabox/idiot-proof-branch

#25 do not do it like an idiot