merged changes to timan
merged changes to timan