Development - Merge latest development branch for Issue #24