Feature fix code warnings

Updated branch to newer 'develop' version.