fixed weird page reload
Merge origin/master