Refactoring
Bumped to v0.3.7