Develop

fixes #10 and fixes #11