Closes #264 #263 #262

I'll update the version when we publish the next version. Also, this should say 4.0.1 did you get latest before making this change?