Fixed some short long unsigned and signed bug
merge file