implementing #3
Merge pull request #6 from ddavison/#3

implementing #3