Merge pull request #1 from Codingpixels/master

Updating from master
admin
Merge pull request #4 from rinkalvictor/master

admin