FIX - GitHub issue #3
FIX - GitHub issue #2
FIX - GitHub issue #4
MINOR - Slight code enhancements.