Merge pull request #3 from futempro/master

auto merge of latest changes