changed diwrapper load process
Merge branch 'feature_20140303' into develop