Refactored
Bump up version to 0.3.0