Merge pull request #1 from mlaval/master

Initial commit