Issue232

This should resolve #232 - @cmbirk let me know if anything needs to be changed.