Merge pull request #1 from freddier/master

pull