Merge pull request #124 from amandeepgautam/master