Implements #23

implements #23