Refactoring
Release 1.0.0-alpha1