refs #1572 bug fix
Merge branch 'akouryy_ja'
Merge branch 'master' of https://github.com/akouryy/hawaii