Final Commit for blaster rifle branch to merge to master.