Fix for issue #1, little bit of work on the (de)compiler system - Bibl.