Merge pull request #278 from elaird/sitv

Sitv
dicts of dicts
accomadating anciant change
Merge pull request #280 from elaird/signalStackFix

Signal stack fix
resolve conflict