few refactorig
Merge remote-tracking branch 'origin/nik5' into 1st-dev