Merge pull request #1 from visbot/master

Bootstrapped
Merge remote-tracking branch 'upstream/master'