Merge pull request #40 from bware225/master

Fixed attack hopefully
for merge