Suguru Hirahara
partially addresses #547