Merge branch 'API1.1'
fixed bug