Eugene Merge pull request josecebe#10 from fromvega/master