Generic modifications
Generic modifications
Merge branch 'master' of https://github.com/omnilord/shield-to-shield