Merge pull request #2 from zapiski/master

Bootstrap
Merge pull request #10 from rokkolesa/master

Merge pull request #2 from zapiski/master