last changes
Merge branch 'nikola'