Last minute fixes.
Merge branch 'master' of github.com:Micket/Sintering
.