Merge pull request #3 from indiansky05/master

trello/yahoo
live.fpi
Merge remote-tracking branch 'upstream/master'