fix issue #13 and bring back the spinner
Merge pull request #17 from aenario/fix-issue-13-dev

fix issue #13 and bring back the spinner