Merge pull request #2 from mrpozzi/master

Last changes