Fix code issue base on Dale feedback.
Merge pull request #1 from Jay-TechSalon/master

Fix code issue base on Dale feedback.