Some updates and refactorings.
v0.1.0