Merge pull request #15 from philburk/round2