Eugene Merge pull request josecebe#30 from ravshansbox/master