fixed spelling
merging
fixed comile issues
merging
merging