add loader
Merge branch 'cursor-loader'