Merge pull request #1 from marinamarina/dev

minor changes
bootstrap added