tysonclugg Merge tag '0.4.0' into develop …