Refactored
Merge branch 'firefly1.1' of https://github.com/in4ray/firefly-sdk.git into firefly1.1