Feature/spinner

Disable/enable support for spinner