Fix type for defaults
Merge branch 'master' of https://github.com/dsv-su/marihanchan