Merge remote-tracking branch 'gravity/master'
Merge remote-tracking branch 'gravity/master'
modified for lokal configuration