Development - Merge latest development branch for Issues #35, #40, #54