changes by saif-yahoo
Merge pull request #1 from saif-yahoo/master

changes by saif-yahoo