Simplified the application.
Merge pull request #6 from tuisco/improved

Simplified the application.