First changes.
Remove tango dependency.
Merge branch 'onreload'