Bugfixes
Merge branch 'Zhaodong'