Issue #188 - fixing develop conflicts