Merge pull request #14 from mcallegari/master

getting latest updates