Update to use newer and maintained packages
Merge pull request #3 from tobek/master

Update to use newer and maintained packages