Update due to SDK modification.
Sprint 1 Week 2
Merge pull request #140 from jmpascal/master

Sprint 1 Week 2