Merging develop to master

Line is too long. [97/80]