Fixed nil, nil issue
Merge branch 'master' of github.com:AGILiDEE/full_name