Issue #3 - Room for improvement
Merge remote-tracking branch 'origin/master'