Merge pull request #4 from lpotter/master

several commits.