working version ready for addon submit
first working version ready for addon submit