Iss87

In response to #87.