Merge pull request #22 from Magenic/master

Merge from Master
Moved bootstrapper file to more appropriate location.
Merge pull request #87 from Bowman74/master

Moved bootstrapper file to more appropriate location.