Merge pull request #35 from andreqi/master

floro