bootstrap improvements
Merge pull request #25 from vzvenyach/bootstrappin

bootstrap improvements