Merge pull request #122 from bwin/iced2

fix #112 - add literate extensions
tweaks after previous merge