Made it fool proof and added dialogs
Merge pull request #1 from werer9/werer9

Made it fool proof and added dialogs