Updated dependencies
Refactoring
v0.3.0