Eugene Simakin Issues josecebe#29 and josecebe#31 fixed