Merge pull request #549 from BSzili/master

Small ICARUS optimization, fixed potentional OOB access with the "ct" command in JK2SP.