Many issues/enhancements resolved - Fixes #6 Fixes #7 Fixes #9 #Fixes 10