Issue #405 pulling develop and resolving conflicts