Merge pull request #2 from Johnidel/master

pull request 11/13
Merge pull request #3 from Johnidel/master

pull request 2 11/13
Merge pull request #4 from Johnidel/master

steve 11/17
wall trial 11/18
Merge pull request #6 from bng8/master

walls and steve
Merge pull request #3 from Johnidel/master

merging