Develop

resolves #2