Merge pull request #1 from doowb/master

integrating assemble stuff