generate_history and join2proyect modified
Merge pull request #11 from chusnen/master

generate_history and join2proyect modified