Merge pull request #7 from SDILogin/test

Merge pull request #5 from SDILogin/master
Merge pull request #9 from SDILogin/master

Merge pull request #7 from SDILogin/test