Some bugs have been fixed
Merge branch 'master'