Merge pull request #18 from aheld84/master

Implements #13