3.0.1 Update

Fixed Some Probs
Merge branch '3.0.1-Update'