Reverted compute back to former state and implemented some additional functionality for hatest
flake8ed everything
Merge pull request #143 from xeregin/revert_compute

Revert compute