Code required to fix #80. Additional configuration modifications required to take advantage of new feature.