Merge tag '2.6.0' into develop

2.6.0
Add missing import
Merge pull request #83 from ionelmc/patch-1

Add missing import
Add tags and classifiers
Add long description
Add license
Merge pull request #84 from timothycrosley/feature/add-package-metadata

Feature/add package metadata
Bump version to 2.6.1
Improve error handling
Merge remote-tracking branch 'origin' into release/2.6.1
Merge branch 'release/2.6.1'