lots of new features
Merge branch 'ltolias'