Merge changes from @rljohnsn - close PR #1.