Merge pull request #656 from WhatsARanjit/master