Merge pull request #1 from Angelfirenze/master

Completion.