massive changes to implement kitFramework compatibillity
Release 0.13