Converted to confidential
Merge pull request #21 from ltfschoen/develop

Converted to confidential