Fixed bugs.
Merge branch 'master' of https://github.com/parthibanloganathan/Friend-o-matic