Feature/issue 336

Include 2 commits : the fix for Pusher (#336) and the fix for the same issues in Puller. Please see commit messages for more detail.