Fix for #2

This is a fix for issue #2 and also a few other fixes related to license headers and classifiers.