Issues/26

should be ready for a release...