Update dependencies; sync testing w/ upstream
Merge pull request #13 from torandu/working

Update dependencies; sync testing w/ upstream