Initial commit transfered from Rosen's jsk repo with many fixes