Merge pull request #1 from Vegasq/master

* bombs
Merge pull request #2 from Vegasq/master

Merge
Merge remote-tracking branch 'origin/master' into gh-pages
* fuck...