added stockfish
merge with upstream