Merge pull request #31 from rbarbera/master

Ok, it seems easier :)