changes to init.py
merging changes