Made a slight simplification to the handling of the align option, see #39.