Optional Agari-yame

This conflicts #7 so that you can merge at most one of these.