bootstrap done + tests
Merge origin/master