Comply with last pusher changes.
Merge pull request #83 from abmargb/master

Comply with last pusher changes.