Merge pull request #10 from frenetic-lang/al-bugfix

Bug fixes to abstraction layer
merge origin master