Manual merge of updates

Signed-off-by: Ilya Ganelin <ilya.ganelin@capitalone.com>
Added helper files

Signed-off-by: Ilya Ganelin <ilya.ganelin@capitalone.com>
Fixed some whitespace errors