Merge pull request #481 from emamanto/master

Awesome Goalie/General Improvements
Remove unnecessary copy