Merge pull request #17 from dreid1991/master

changed data displayer
Regular expression stuff
Merge pull request #18 from bowenal91/master

Merge pull request #17 from dreid1991/master