Merge pull request #1 from bgamari/master

Various updates - thanks bgamari!