Started work on cython
Use relative imports in __init__.py
Merge branch 'master' into cython
Fix cython importing.
Started using cython for speed optimisation.
Fix __init__.py