Merge pull request #1 from pchaigno/master

Initial pull request