Merge pull request #561 from sudo-bmitch/pr-v1.1.1

Merge pull request #561 from sudo-bmitch/pr-v1.1.1 #46