Merge pull request #1 from lexwebb/master

Adding IceWall changes