Do not include binary
merge from master
Minor changes