Merge pull request #23 from jrv7/D00019

D00019