Merge pull request #2 from pslam92117/master

1st pull req