Additional push for #2

It is a patch push for #28.