Merge pull request #16 from datanium/master

pull request
save user, password check
Merge pull request #132 from tonymouse/master

commit code