Merged upstream changes. Added license classifier.