diamond fix
Merge branch 'master' of https://github.com/lucyyu/6813Proj