Closes #1005
Closes #755
Closes #326
Merge branch 'test' of github.com:kellyelton/OCTGN into test