fec13de Merge pull request #96 from sho-h/issues/95