#670 recreated problem
#670 using suffixes for xsl files
Merge remote branch 'fork/670'