Merge pull request #1 from lubecjac/master

Merge pull request #5 from daltondan/master
Merge pull request #6 from daltondan/master

Merge pull request #1 from lubecjac/master