Merge pull request #52 from dreamteam69/master

Cleanup and implement better dialog boxes