Merge pull request #5 from KB50-G1/develop

Moving features to Master, to check gitflow