added +build !goci
merge