Close Issue 73

I did the changes commented in the issue #73 plus some cleanup and other small change related to how the spinner.gif was loaded before.