bug fixes for last addon update
Merge pull request #84 from elcabong/Dev

bug fixes for last addon update