Merging develop to master

Useless assignment to variable - `rigth_now`.