qwales1 Merge pull request #257 from tylermcginnis/v4