Last changes before the 3.4 release
Merge pull request #27 from fjcarreterox/master

Last changes before the 3.4 release