Merge pull request #1 from lexwebb/master

Adding IceWall changes
Merge pull request #2 from lexwebb/master

rebase
Merge pull request #6 from Diremonsoon09/master

rebase