brandonarbini Merge pull request #84 from sevenwire/hotfix/modernize …