CLOSE #8: Merge a branch from Eclipse

Merge a branch from Eclipse
https://github.com/jbrockman-emu/sandbox/issues/issue/8