Merge pull request #320 from s0undt3ch/develop

Merge fixes for develop