Merge pull request #22 from aheld84/master

Implements #21
Design: Implements #23

implements #23