missing __init__.py and __future__ imports
Merge pull request #2434 from larsmans/master

missing __init__.py and __future__ imports