Merge pull request #19 from rinkalvictor/master

update master
Merge pull request #11 from Codingpixels/master

Merge pull request #19 from rinkalvictor/master