Possibly fixed #797
Merge branch 'test' of github.com:kellyelton/OCTGN into test