Merge pull request #49 from philburk/v28