Fix git merge mistake
Merge pull request #178 from elandau/bootstrap

Fix git merge mistake