Support live reload
Merge branch 'develop'