Merge pull request #1 from RMerl/master

merlin1