refactor
Merge remote-tracking branch 'rapid/master'