Fixed Pep 8 Error
Merge pull request #668 from normanjaeckel/PEP8_2

Fixed Pep 8 Error
Update metafiles for new packaging style
Merge pull request #664 from normanjaeckel/Packaging

Update metafiles for new packaging style