Intermediate version, add issue 114