Implements #53