Updated
Merge branch 'master' of github.com:sendanor/nor-stack