better parsing of the file
merge develop