Merge pull request #3 from lubecjac/master

update
Merge pull request #9 from daltondan/master

Merge pull request #3 from lubecjac/master