Develop

closes #6