Merge pull request #19 from rinkalvictor/master

update master