Commit from bzg computer
Merge pull request #1 from bzg/master

Commit from bzg computer