Enhancements that closes issue #4