Merge pull request #4 from samoth93/features_mod_defy

Features mod defy
Merge branch 'develop' of https://github.com/StaffNK/NK_TEST into develop