Revert "Manual merge of pull request 28"

Changes moved into slat wall feature branch