Develop

Finish version 0.3.0