Merge pull request #12 from nickm/fix_5

add support for non-expression, i.e. full program compositions