Merge pull request #34 from dolob-mrmr/master

111014