merge: from Pawel
add: hex s