Change old style hash expressions
Merge branch 'master' of github.com:kaznum/sanataro