Many updates and fixes in response to Owen Ambur's feedback.
Update add-on.
Merge pull request #8 from georgebina/master

Updates in response to feedback.