Cleanup and a few new feature additions
Merge pull request #14 from aspencer8111/cleanup

Cleanup and a few new feature additions