Merge pull request #4 from lubecjac/master

updae
Merge pull request #10 from daltondan/master

Merge pull request #4 from lubecjac/master