modified __main__ to calculate all the data
minor bug fixed
minor bug fix
added except for thesis git no university