issue #37, Code problems fixed.