Created reload
Merge branch 'feature/reload' into dev