- bootstrap integration
Merge pull request #26 from cmarinos/upstream

- bootstrap integration