Merge pull request #3 from zapiski/master

Bootstrap
Merge pull request #13 from Osebek/master

Merge pull request #3 from zapiski/master