added gcc info
added scala info
merge two branches