Merge pull request #2 from sdouglas/master

Merge pull request #6 from pwerba/master