Refactor hotfix
Merge pull request #7 from Daytron/hotfix/Hotfix-Refactor

Refactor hotfix