changed null to user.id
Merge pull request #24 from Karnith/master

changed null to user.id