NOJIRA Minor mods to pull #174