Merge pull request #2 from sdouglas/master

Merge pull request #6 from pwerba/master
Merge pull request #8 from pwerba/master

Merge pull request #2 from sdouglas/master