fix master so it works correctly in regards to binary data
bump versions
merge from master