working on reentrancy
Merge branch 'dev' of github.com:scalen/squall into dev