Add bullet proofing
Merge branch 'master' of https://github.com/tchapi/pianette