#275 crunch merge into develop

- resolves #275