upgraded to latest versions, fixes #7