Merge pull request #59 from mdjordjevic/bugfixing

bug fixing
aligning with latest version of the SDK
bug fixing