Merge pull request #5 from efontana/master

Merge branch into master