merge: lazy support - thank you martin :)
minimal bugfix: lazy option