merge in changes from @wardpenney
Merge pull request #15 from klamping/merge-wardpenny

merge in changes from @wardpenney