Added Spinner
Merging master changes