merging forks#1

tomorrowCoder wants to merge 2 commits intotomorrowCoder:mastertomorrowCoder/shim2-dev:masterfrom

perpetual-hydrofoil:masterperpetual-hydrofoil/shim2-dev:masterCopy head branch name to clipboard