Merge with abelsutilo branch