Content fixed
Neat-feature render fixed
Merge remote-tracking branch 'origin/master'