Development - Merge latest development branch

Updates for Issue #17.