Small change, and temporarily removed kryptan_core.
Reinstated kryptan_core
Merged master with origin