Merge pull request #1 from Lytro/master

Sync branch to upstream