First pass at 0x00406C96
Merge pull request #365 from jcdavis/master

First pass at 0x00406C96