Merge pull request #7 from patrickcarter/12346_make_patrickc_work

I am working