Adjustments
Merge remote-tracking branch 'origin/master'
Random current value in init
Small improvements