Merge pull request #140 from jeroenheijmans/update-packages

Update to recent versions of packages

Author: jeroenheijmans