Fixes #817
Fixes #815
Fixes #791
Merge branch 'test' of github.com:kellyelton/OCTGN into test