Develop

this solves #2