Tickles #24
Update recent changes
Merge branch 'test' of github.com:kellyelton/OCTGN into test