Merge pull request #6 from lclc98/master

Added GUI, needs user proofing
Basic format changes.