Refactored the class internally to give a nicer looking output.
Merge remote-tracking branch 'origin/master'