Added:
    to a package, it must contains a __init__.py file, so added it.
Merge remote-tracking branch 'origin/master'