Merge pull request #2 from docbronovan/master

Merge pull request #1 from docbronovan/bootstrap
Merge pull request #3 from docbronovan/bootstrap

Merge pull request #2 from docbronovan/master