Will potentially do this in the future in another pull request.  Good idea though =]