Added trace and time
Updated code
Updated version  0.1.1-pre2