Development - Merge latest development branch with Issue #19 Updates