cleaned up, ready to ship issue #26