Develop

fixed #6