#136 fix ARM compile
#136 fix merge