Version 2.1.0.6 preview

See previous fix/improvements + new:
Lazy loader is now optional (disable by default)