Merge pull request #4 from nmck257/master

merge
almost there
update