Merge pull request #1 from demattia/master

need new code