Enhanced end user experience
Merge pull request #3 from gstofer/master

Enhanced end user experience