Force int for hash for oxidation state.
Merge branch 'master' into surface