Committed to GoDaddy for issue #7 on Nate's repository