Merge pull request #10 from Codingpixels/master

Updating from master
order changes
Merge pull request #19 from rinkalvictor/master

update master