updated working changes.
small bugfix.
Merge branch 'master' of github.com:wpfff/diamond-analysis