Added a killer feature
all fixed
Merge branch 'feature'