Bug fix (455) + initial commit (454)