form spinner
Merge branch 'master'