Merge pull request #47 from sergiud/master