start on #7
Merge pull request #26 from pinkelgrg/7

start on #7