refs #42
fix #42 -- complete testing
fix #42 -- complete testing
fix #42