Merge pull request #24 from PicoPlan/bootstrap

Bootstrap
Merge branch 'master' into bootstrap