Merge pull request #13 from Codingpixels/master

updating from master
conflict changes
Merge pull request #36 from rinkalvictor/master

conflict changes