commit for Eran
Merge branch 'master' of https://github.com/saharrehani/Pinster