Merge pull request #7 from sergiud/master