First commit from version 0.44