merging changes from wavetour

Signed-off-by: RJ garcia <rj@bighead.net>
Adding Krak\Model::get_jt(), making minor changes

Signed-off-by: RJ garcia <rj@bighead.net>