Redesign
SDK update
Merge pull request #41 from mdjordjevic/bugfixing

Redesign