Development - Merge latest development branch for Issue #50 and #22