Merge pull request #32 from Kinesis-P4/sprint4

Sprint 4 release