pull request from zcmoore/master

Not what I was wanting to do....