Merge pull request #1 from nunnerys14/master

5y
rgreg
junit test
Merge pull request #8 from bishopj15/master

unit testing added