Update for upstream changes
Merge pull request #17 from klutzy/upstream

Update for upstream changes