Fixed issues.
Merge branch 'master' of https://github.com/in4ray/firefly-sdk.git