Fixed #27
Fixed bcf xsl
Merge branch 'dev' into ms