First commit with bug fixes and feature additions
Merge pull request #1 from terrameijar/master

Fixes application crashes after invalid input and fixes typos