Merge pull request #24 from CanvasHS/dev_j

Fixes dependencies
Protocol: Output test completed, with arbitrary testcases
Tests: Merge
Merge remote-tracking branch 'origin/master' into dev_j