Merge pull request #1 from JDCB/master

1