merged develop into feature/serfn

All the tests are currently passing.