Done enough for #17. integration in build process will be resolved in issues #10 and #11