Signed CLA 2.0.
Merge pull request #61 from claylo/master

Signed CLA 2.0.