Mevanoff/bugs

I don't know how often you want to merge these in but this does have a fix for #60, which was labeled as critical