Merge pull request #62 from philburk/codesize