Merge pull request #5 from efontana/master

Merge branch into master
Merge pull request #7 from efontana/rel1.x

Merge pull request #5 from efontana/master