added support for default lambda calculation, fixes #16