Merge pull request #37 from nicolasnoble/UX

Improving user experience.