initial commit from version 1.5.1