Merge pull request #40 from Kinesis-P4/develop

Develop
Merge pull request #41 from Kinesis-P4/QA

Merge pull request #40 from Kinesis-P4/develop
Merge pull request #42 from Kinesis-P4/sprint5

Sprint5