Issue141

Corrected issue and improved spinner messages.