version 1.2.1 - merge with develop branch
version 1.2.1 - merge with develop branch

KonkerLabs/konker-platform,KonkerLabs/konker-platform,KonkerLabs/konker-platform,KonkerLabs/konker-platform,KonkerLabs/konker-platform