Bringing up to speed and fix for issue #4 and #6.