Merge pull request #1 from MitchellJThomas/master

Updates to accomodate latest dependencies