Merge pull request #46 from shadowglen/master

Fix same bug as issue #44 in user page