Merge pull request #24 from Kinesis-P4/develop

Sprint 3, Ready to merge at QA
Merge pull request #29 from Kinesis-P4/develop

Sprint 4 release
Merge pull request #32 from Kinesis-P4/sprint4

Sprint 4 release
Merge pull request #37 from Kinesis-P4/develop

Sprint 5
Merge pull request #38 from Kinesis-P4/QA

Qa to Sprint 5