Enhancements based on feedback
Merge pull request #55 from derekwaynecarr/feedback_update

Enhancements based on feedback