Fixbug login for #145
Merge pull request #157 from kimkha/develop

Fixbug login