Merge pull request #6 from kreider1997/master

merge