removed fucking test
fukcing test
Merge branch 'master' into adding-api