merge changes from gibstick