Bootstrap updates
Merge pull request #2 from orice/master

Bootstrap updates