Merge pull request #25 from mtsugi/master

Minor tweaks to ep24