Merge pull request #40 from Kinesis-P4/develop

Develop