Dev

merge dev to master, for UX v.0.4.10