added description
added description
Merge pull request #1 from asaumierdemers/master

merging branches