Update to reflect implementation reality.
Merge pull request #1 from shinrich/master

Update to reflect implementation reality.