bug fixes #10, 11 and 12 from SDK issues list
Merge pull request #2 from labriola/develop

bug fixes #10, 11 and 12 from SDK issues list