changes in complience with gcc
merging...