Projectlogin jfc

Please check and integrate my commits to the master branch.