Issue547

I broke github and had to delete my branch and reupload it.