using only Fuchu
Merge branch 'feature/fuchu-testing'