Feature/v0.1

Some improvements and refactoring.