B-0 fix bug with ssize_t
B-0 merge master with development