Merge pull request #3 from futempro/master

auto merge of latest changes
Merge pull request #2 from hbergeronx/master

Merge pull request #3 from futempro/master