Implements #21

implements #21