Protection work
cleanup
Merge pull request #34 from DonoA/master

protection upgrades