Update code with changes from testing
Merge pull request #38 from acummins/master

Update code with changes from testing