included bootstrap
corrected some paths for development
Merge branch 'release/0.1.0'