Solve issue
Merge pull request #166 from newsocialifecom/master

Solve for issue #148