Merge pull request #21 from Daikatana/master

Shield deflection
Merge pull request #14 from MikePaNtZ/development

Development merge