Refactored f# rendering
Merge remote-tracking branch 'Chanika/master'