swashata Merge pull request #658 from Freemius/develop