Merge pull request #38 from dolob-mrmr/master

updating branch in github from master