fixes #48
#27 minor (removed commented out code)