Fixed strpos()
Improved SignIn
Merge Master