Issue #111 - Pull develop and resolve conflicts