picking up changes from upstream
Merge pull request #14 from dbeck/master

picking up changes from upstream