Develop

I merged in the changes in molnsoptim into develop since I think they should go into the next minor release.