Refactored scj4 -> coljate
Merge origin/master