Merge pull request #1 from bcharrow/master

1