Update classifiers and bump version
Merge commit '6f81717'