v0.7.6

Code refactor