Merge pull request #9 from kreider1997/master

feature up to date with master