release v1.8: code improved