Merge pull request #1 from superbacker/master (+ trivial fix)