Merge pull request #287 from elaird/binary

Binary
Merge pull request #288 from elaird/binary2

Binary2
store and scale by s_nom
do not round
merge sHat